From d73ed0e9a4de361bd84a862bf9249bfc3eacd42e Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 25 May 2006 21:18:55 +0100 Subject: [PATCH] Fix VMEXIT tracing. Signed-off-by: Bruce Rogers Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/svm/svm.c | 11 ----------- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 7ce76807d2..689ac6161d 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -51,13 +51,6 @@ #define SVM_EXTRA_DEBUG -#ifdef TRACE_BUFFER -static unsigned long trace_values[NR_CPUS][4]; -#define TRACE_VMEXIT(index,value) trace_values[current->processor][index]=value -#else -#define TRACE_VMEXIT(index,value) ((void)0) -#endif - /* Useful define */ #define MAX_INST_SIZE 15 @@ -817,7 +810,6 @@ static int svm_do_page_fault(unsigned long va, struct cpu_user_regs *regs) return 1; handle_mmio(va, va); - TRACE_VMEXIT(2,2); return 1; } @@ -843,7 +835,6 @@ static int svm_do_page_fault(unsigned long va, struct cpu_user_regs *regs) return 1; } - TRACE_VMEXIT (2,2); handle_mmio(va, gpa); return 1; @@ -856,8 +847,6 @@ static int svm_do_page_fault(unsigned long va, struct cpu_user_regs *regs) set_bit(ARCH_SVM_VMCB_ASSIGN_ASID, &v->arch.hvm_svm.flags); } - TRACE_VMEXIT (2,result); - return result; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 58ca365a19..1082446c02 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -47,7 +47,7 @@ #include #include -static unsigned long trace_values[NR_CPUS][4]; +static unsigned long trace_values[NR_CPUS][5]; #define TRACE_VMEXIT(index,value) trace_values[smp_processor_id()][index]=value static void vmx_ctxt_switch_from(struct vcpu *v); -- 2.30.2